Skip to content

Sync latest commits from WebGoat/WebGoat - #46

Merged
fgibelin merged 7 commits into
mainfrom
fgibelin-sync-upstream-dc3
Nov 8, 2026
Merged

fgibelin merged 7 commits into
mainfrom
fgibelin-sync-upstream-dc3

Conversation

@fgibelin

@fgibelin fgibelin commented Nov 5, 2026

Copy link
Copy Markdown
Owner

Summary

Merge the five new commits from WebGoat/WebGoat:main through be2c186b94201bcbdfa46c3a6f5f53dd83262d6a, preserving the fork-specific history.

  • Update REST Assured to 6.2.0.
  • Update docker/login-action to 4.7.0.
  • Update Maven Surefire to 3.6.1.
  • Update Alpine builder images to 3.24.3.
  • Update java-jwt to 4.6.2.

Validation

The upstream merge is conflict-free and git diff --check passes. A local Java runtime is unavailable; GitHub Actions must validate the merge before it is merged into main.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 Needs a closer look

Documented incompatible behavior changes in REST Assured 6.2.0 require Java 25 unit/integration CI and amd64/arm64 desktop-image build validation, but those results are unavailable.

No open issues 🎉

What changed in this PR

Syncs five upstream WebGoat commits into the fork, updating dependencies and build tooling while preserving fork-specific history.

Changes:

  • Updates REST Assured to 6.2.0, Maven Surefire to 3.6.1, and java-jwt to 4.6.2.
  • Updates both desktop image builder stages to Alpine 3.24.3.
  • Updates the release workflow’s Docker login action to 4.7.0.

Runtime validation remains pending in GitHub Actions because a local Java runtime was unavailable.

File Description
pom.xml Updates REST Assured, Surefire, and java-jwt versions.
Dockerfile_desktop Updates the ZAP and JRE builder images to Alpine 3.24.3.
.github/​workflows/​release.yml Updates docker/login-action to v4.7.0.

Review effort: Balanced

@fgibelin

fgibelin commented Nov 5, 2026

Copy link
Copy Markdown
Owner Author

Sync is ready and Copilot has been assigned; Copilot also completed its requested review. Merge is blocked because not all checks passed: the pre-commit job cannot install Python 3.9 on the current Ubuntu 26.04 runner, so the Maven build was skipped. The JavaScript/TypeScript CodeQL job also failed. The PR remains open and its branch is retained, as requested merging and branch deletion are conditional on all checks passing. No unrelated CI configuration or intentionally vulnerable lesson code was changed.

Keep Python 3.9 available after ubuntu-latest moved to Ubuntu 26.04.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 Needs a closer look

Required GitHub Actions validation remains unconfirmed, with no successful Java 25 CI results supplied for cross-platform Maven verification or multi-architecture desktop image builds.

No open issues 🎉

Review effort: Balanced

@fgibelin
fgibelin merged commit dbb75db into main Nov 8, 2026
9 checks passed
@fgibelin
fgibelin deleted the fgibelin-sync-upstream-dc3 branch November 8, 2026 09:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants